Fixed Infinite Scroll Data Source and added related unit tests