Drawing tests structure cleanup