refactor swap() and touch() to return boxed Long
add test case for swap()
add table dropping on test-class teardown
add version test
refactor-rename '..WithoutResult' to '..NoResult'