Fix some of the tests, identity test will be re-implemented once client is done