MUS-85: Added draw test cases

- Added two new draw test cases
- Draw refactoring