Clean up logging, extend client-test