Added dependency tracking.
Updated tests to play nice with 0.10.