Added in tests for swapping comparison values
Reorganized tests. Added inverted name and server test case