Update tests and create tests for Canvas Model
Remove commented code and do minor refactoring on Canvas Model