Add suite and test times to JUnit reporter XML output
Fix formatting of case statement.