Changed all of these tests to be TestRunner tests (or, at least they can be