Improves test and cleanup.