Test fixes

Not ready for merge yet
No I believe the logic for scaling a rectangle to the 400x400 test canvas got changed in QGIS