Lots of new units and first tests for expressions within units