Fix tests

Fixes test mentioned in #699. That one must be merged first!