Cleaning up tests to remove pollution
Fixed load_files' filter and promise
Merge branch 'jeversmann-master'