Added some tests for expected behavior of server handlers, plus some fixes
Finished server handler testing
Changed names represented in json