Refactored MockServerSupport

It does not seem to break encapsulation, but definitely looks cleaner.