Slightly change API of Test class