Add list tests
Merge