Make test pass #1030 and pep8.
Merge remote-tracking branch 'origin/develop' into fix_tests
Update translation and pep8.
Elder to Elderly.
Fix unit test.
Fix conflict.
Merge pull request #1033 from ismailsunni/fix_tests

Fix tests