All the tests pass now. Really need to sort out the endpoints and the fact the singleton means we can only have one server in a VM.