more minor unit tets fixes