Finished the refactoring of the commands and the fixtures