Refactor PropertyFileMerger and add missing tests
Cleaned up test code and added a couple of additional checks.