add 7 bottles to config and fix bug in macro
config for 5-bottle test on 2013-11-17