Added exercise test, changed mocker to return data to use for mock env