test fix

test fix
some progress in reporting

some progress in reporting
Merge remote-tracking branch 'origin/back-end-working' into back-end-working
Fixed a bug.