Added a test for double swapping.  Also commented the test code a little.