Changed two test cases to not use deprecated values