test changes

Bringing in the latest changes from the final tests.