Ashwin / dileep  | #2298 | Optimizing functional tests in TestDataAnalysis