Cosmetic fixes to the unit tests
Add file existence confine to packagelock
Merge pull request #24 from bkkrw/master

Add file existence confine to packagelock