Issue #181: Tests fixed?