Fix unit test breakage from #63