Converted file tests to catch