Added unit tests
Fixed some issues with design
Added Paging for grid and made it support filtering