changed tests' folder structure