Final changes to testing.