add 2.5 with tests