Fix tests (fixes #41)