Split tests to more classes