Add tests for the new dependents. And fix bug therein