Cleaning up tests around collections