Adding demand data table view and commenting out old non-used tests.