Renamed swap tests to have the swap- prefix. This way these tests will be more apparent in the test report.