fix a couple of tests
build&test only, no p2