Fix width and height
Add tests for width and height