Improved tests by splitting to test classes and packages