Partial work on basic drawing tests