Fix line tracking for catch-case
Fix old class syntax in test