added more thorough  - test setting; fixed regressions