Added tests
Merging with listview implementation