Fixed breaking unit tests and bugs in McfManager