Proxies, folders, resource maps, aggregations. 2 tests fail.
Folder resource maps improved.
One test still fails.