Remove test_ from helper function names. Convert more tests.