Fix failing test and reorder logging to always log