Fix tests after issue #58