Ensured we cannot loose any trace. Reformatted.
Comments updated, reformatted.
Test updated and robustified.