Move around test dependencies. All tests pass.