Work on draw unit tests
Unit test draw work