Test the test-server
Refactor, remove extraneous validation code, build api in 'cludje