Made tests more debug-friendly