Moving test to the right package