Update dimensions and add unit tests.
Merge
Merge part duex