Changes to make unit testing the client easier