More ClientController and test refactoring