refactoring and starting tests for Drawing (broken)