Merge pull request #764 from jyotisingh/package_repo_bug_fixes

#718 - Fixing failing test
#718 - Rephrased error message