add forks and fix tests