Logging test merge

Beware the conflicts! BEWARE!