added default values for choices and tests