merge in master, fix tests