Adding some additional test cases for the cleanup attribute.