Simplified content resolving, multiple ids, finished unit tests.