Update more unit tests