Cleanup test and add mock server

[scanon]

This cleans up some tests and add a mock server which should allow for greater coverage during testing.