Add replace, move, delete and their tests