Change expect_equal to (mostly) expect_identicals
Add raster tests back