Item Group test passing, some test refactoring