Fixed server to work with stand alone unit tests
Updates for unified unit tests