Changed classes to work from TestCheckers.