Moving test to a better place