Minor updates to testing.