fix references in tests, and a couple strays in Core