Add require for mock, clean up test case