canvas tests plus more cleanup