refactor test classes