Fix tests for PR/146