Fix tests -- seems I explicitly didn't want previous behaviour :-)