refactoring and fixes to Tmx.Server and Tmx.Server unit tests