cleaned up and reduce tests
Merge branch 'units' of github.com:sfxfactor/UnitsAsTypes into units