Refactor tests to use simpleunit; clone in find result