Resource format handling
Added more tests