Convert most tests to new base TestCase
Convert remaining tests to new base TestCase