Fixes to testing.