Simplify use of IDENTITY
Updated tests and compiler switch for gcc-4.8.1 on up to prevent out of memory problems.