test fixes for new resource format