Minor test fixes
Add width and height support

Resolves #3