Updated test coverage from the List branch