Nicer logging
Test fix
Better logging in examples