Update test server to work with docker a bit further