Changing test cases to reflect the package refactoring
3 files changed