Tests with canvas working

Tests with canvas working, good base to go forward with Graph and Graph-Canvas integration