Fix test dependencies
Merge branch 'master' of github.com:xnlogic/xnlogic

* 'master' of github.com:xnlogic/xnlogic:
  added aliases for xn-server/console + some env helpers