Fixed nightly fallout and dependency tracking for tests