Fix long->int properties.
fix expected error message in test
Update IT.