Adapted tests to new resource resolution system.