Enable all test from #22. Update #26