Latest changes to testing.