various

* fix the invalid (and skipped) tests in usage
* invent the swap method
* remove all right method forms now that swap is available
* about 20 tests removed
* rename some tests for consistency