Feature/improve test for lists