FInish renaming in tests
Merge branch 'master' of github.com:dabbler0/ice_editor_canvas