Add test framework
Update ports in test
Merge remote-tracking branch 'origin/master'

* origin/master:
  Port was already used by X