Minimal testing/logger additions.