Enhanced command builder tests