Moving test to folder