Add ItemBuilder and complex tests