Freshen testing

A few, hopefully minor, changes in order to run `kitchen test` successfully.