Changing tests to use with a class