Commit # 7

Added e2e tests and fine-tuned code