Move tests in to correct directories for better organisation