watch for I in Factors
fix failing tests