Cleanup the arguments and add sanity check
Add separate dummy stores for 2 and 3 zone cluster