1)Merging Canvas drawer logic to test.js
2)Refractoring