Also swapped the h & w values in the unit test.