Oops - add updated tests that didn’t make it in previous commit.