Fixing uppercasing of selection options
fixing tp-342 issue and adding basic tests of new default values