refactored ogreclient to support integration testing