Fixing the currently broken tests.

Fixes #226.