Fix the dependency issues. Correct some more internals tests.