Better logging for the debugging + test phase