Changing tests folder structure