Updated ItemsList and tests to work with Unit.