fixed errors in test classes that popped up due to refactoring from last time