tighten geometry convergence and loosen test for fnocc2