Revert code to use test_utils TestCase