Also updated unit tests: - Added unit tests for the new ItemBuilders classes - Refactored existing tests to use the new builders