Completed cleanup tests, back to 100%