Fix tests which fail since #60 was merged.