fixed some tests broken by 8fff83efa935e116acb27edc60c21c5f633f86f2
fix for `should collapse load of same file`
fixed scoping issue in tests setup
Merge pull request #2 from simock85/master

Merge fixes to the collapse of multiple files with same name on load