Fix up tests
Extensions
Extensions
Extensions
Extensions
Extensions
Fix up tests
Merge branch 'master' into semirings