+ refactoring and fixing bugs
~ adaptions for Move test