Add 2i term regex tests
Use 1.4 branches of clients