Refactored test cases
Removed namespacing for server state module