Fix existing commander specs to work with new system