Issue #194: Fix the f***ing tests.