many changes to client module, started integration tests