Fixes for unit tests (no longer rely on exact formatting, as that was needlessly brittle)