Merge "e2e testing using mocks"