Add move and tests