Converted a few more tests to use the databased backed resource manager.