refactors design of Server based on Micah's design pattern && refactors all tests