Fixing parts of Graphics integration test.
Merge branch 'AH-259_2d_rendering'