Fix for parameter domain set and new associated tests
Correct param setting for test
More fixes
Merge branch 'develop'