Added cleaner exit, and also indication for test file of org vs patched