cleaned up test draw code for the nth time.