Removed mock code from tests