Reorganise folder and corrected tests to work with our new method