Fix test cases, add new list<_>