Partial refactoring fix of tests dependency tree