Fix unit tests for scala 2.9
Merge pull request #408 from edani/reloadfiles-master

Apply the unit test fix for #400 to master