Implement findTestFile. Other tidying.