Started working on acceptance tests
Working on acceptance tests for keep_secret parameter
Typos fix in unit tests
Merge branch 'feature-keep_secret'
Synced with feature-keep_secret branch and updated travis.yml to run tests on this branch too