Adding test, modified ClientLogic and others