Forks bug fix, tests re-build