fixing the swap tests (from Dexx)