Moved catch file out of test lib.