spring changes to make sure most files are loaded only once
make test more repeatable