add test and move one from rm to rmi Upstream-commit: 40070609da618f5b89482682168220432687a51b Component: engine