fix two more unit tests