merge

fix tests