Moved more objcs to items
Fixed tests as a result of item refactoring