reworked dependency tracking api, tests passing again