moved changes from drawing test into drawer