Fixed set server mapping test case, commented test cases better as requested by Victor
Fixed test issue