6/25 updates

Tests and some non-canvas items.