Behaviour improvements
JUnit output improvements