Final (??) changes to test units.
Merge branch 'master' of github.com:OpenPhilology/phaidra