Random refactoring + client unit tests started