Fixed tests after changes to test cases.