Add test with one forward dependency
Some test refactorings