Fix up failing tests... still not sure that the sign is right but there are other issues to fix (debug mode will help)