moving tests to a subfolder and adjusting the paths