split tests on more meaningful classes