fix failing tests
Merge branch 'master' of github.com:edeustace/assets-loader