Fix move and move test