Swapping order to tests to match code in lab files.