Improved share tests
Variable names