Jnygaard two canvas test cleanup