Clean up sleuth, replace mock-calls so that the tests actually work