Moving tests to subfolder and main run file