Loaded files
Added tests
Fixed tests