move+ fix tests