changes to make test cases pass