General improvements to reports handling
Added more reasonable tests