Test case clean up for maximum coverage