No more direct dependencies.
Updated the test files.