Fix display of deviations
Refactor tests to be more expressive