Test cleanup for OC-11422

Test expected me to clean up after myself. Who knew?