Upgrade reporter - add lazy tests