finishing up testing
Merge branch 'develop' into feature/RumorGenerator