Refactored share tests
Minor logging and declaration improvements