Cleaning up test suite for expansion
Enterring the frustrated territory of numeric and length units