Split out tests and added arg to draw