ISSUE#3: Added E2E test