Revert "More tests"

This reverts commit dc2cd769b5f3895137b1823bbabae27f871b0c98.
Revert "Command fix test"

This reverts commit a738213ed394a784e19bf1ffde63001cd87cb573.