Add width normalising.
Add tests for width and height normalising.