Moving test to right package