Moving test to different class