Adjusted unit tests to accommodate new changes that affect assertions