Got rid of _test_cases namespace