Fix move up/down methods and add tests