Refactoring
Adding server and stub tests
Refactoring
Cleanup edit