Uodated unit tests