configurable values added
added logging setup
Merge branch 'test-server' into integration