Merge "Fix modf* tests"