use newer style for calling class methods
fix tests
refactoring of file providers