Added new tests
Merge origin/Server into Server