Refactor commands specs