Fix wrong include

and add tests for move.