catc removed from tests
Further catch clean up