pre & gp screening seems to be working in reports #578
fixed minor test issues
shorter inline names for better readability