Add test script for remove/replace (not yet passing).
Get remove working.
Get replace working (mainline only).