fix tests of master, added 2.5 testing