Amended tests to meet the new changes