changes to make mocks and mock_completeness work