Updating the tests with refactored class packages