Update tests to go with new Canvas