Fixes fileending issue
fixed all tests
Merge branch 'WEB-141'