Tests: Fix up the unit tests somewhat.