Add expect_test.go, tweak prefixes