Fix tests after pull #8