Intra-trace dependencies added.
Inter-trace deps and tests.