Add tests for data + list-view