Moving test classes from packages