Cleanup added to SH test code