Catch the correct exceptions classes and not the broad Exception that will swallow anything and say that is a pass when running tests.
Also fixes some wrong test file tuples that was pointing to the wrong files that did not exists on disk.