More passing client tests by moving methods