handling 'and' in units
fixup
temporarily removed 'convert' to get 100% test coverage
added shippable