Improved selectserver and olaclient mocks