Fixed failing tests from #104