Any existing unit tests that still make sense should be moved to the new catch unit framework introduced by PR #874.