Fixed test to have seperate stroke/fill drawing function

Improved performance of offscreen drawing...