backfill test
try to bootstrap logging
remove code duplication