Moving test to own folder