Final fixes for testing.