[+] Added midway + e2e conf and tests
[+] Added some controller testing
Merge branch 'develop'

* develop:
  [+] Added some controller testing
  [+] Added midway + e2e conf and tests