Refactor test server
Address code review and formatting tweaks
Add failing response server, fix tests, remove raise