Tweak

A couple of quick tweaks and fixes for the tests.