Fix wrong include

and add tests for move.
Merge pull request #44 from Flast/develop

Fix wrong include