dependency extractor unit test / fixes