Misc tweaks to acceptance test

A couple of misc tweaks. Commits messages say it all. :)