Add swap

Details:
- Add swap and update tester
- Remove some unnecessary comments throughout