Finish migrating sphere-client for integration specs