ADD: update tests to handle list elements