Redesigned Map.remove test - exposed bug in remove which caused bug #224 in TreeSet (which depends on TreeMap)
Formatting only