Refactored draw-tests for easier improvements