Added swap tests