fixed nullmarket, sourcefacility and tests to use new resource classes