tests reorg
fixed resource syntax issues