Lps 52291

There was a separate test method for cleaning up, I merged it into the relevant test.