Add 2.4 with tests