partial conversion to new report variant, no more raises
more bug fixes for new style - one test still failing