Fix some tests, dev green.