Improved share tests
Variable names
Improved test coverage
Merge branch 'master' into citizenship