Ashwin / Anishek | #2298 | Adding different scenarios for end_to_end test