More fixes to logging in server/app/server.js and wrapped-test