Server side tests refinement
Merge branch 'master' of https://github.com/umkogut/4350Proj