Make drawing commands functions instead of macros so they can be stubbed when testing with midje 'provided' clauses.