Updated tests to play nice with 0.10

+ Added dependency tracking.