refactoring in Tmx.Server; refactoring in Tmx.Server.Tests