Enhanced some tests for easier debugging of production situations