Fix for #2, merge file into defaults

This changes the loader to merge the loaded files into the "defaultFile" to achieve the expected merge results. This PR fixes the issue, and updates the tests.