added draw test
Refactoring the ifs