Fix tests broken by rc227e9c from #16