Fix fillRectangle not drawing correct dimensions when origin is not 0,0
Update test code in main