Fixed some of the failing tests from GF and leadprocess.