Updated swap tests..