More object resolution testing
More object resolution fixes
More object resolution fixes