Refactor data source pages
Refactoring data source page: Add tests.