Removed some comments and extracted a test from another
Added simpler method signature for swapping two subviews