* fix command order
* add integration test
* test cleanup
* remove redudant commands
(cherry picked from commit 602a618e60)
* fix command order
* add integration test
* test cleanup
* remove redudant commands
(cherry picked from commit 602a618e60)