Added some server more tests