Small changes to gwf class and second test problem.