Some improvements to the Pomo test file and classes.