moving test data files to correct folder, improve test