Sensible logging

The branch was badly named, only logging was dealt with, not testing