Update test and test cleanup.