Refactored managers and added OperationFactory tests