Removed unused 2.5 files
Added tests for J2.5