fixed issues discovered by JUnit tests
fixed faulty tests
Merge pull request #705 from davherrmann/issue#701

Issue#701: fix bugs in SettingsViewModel