Updated the 2.6
Added the unit testing for 2.6