Fix move function and add a bit of tests