More relevant trace
Improving tests