Integrated new testable server code with server impl