Rename test to testrun and improve a couple method names.