Last bug on eskollz-ngclient testing... tests should work
Merge remote-tracking branch 'origin/master'