Reports 95

I added more tests to match details on the wiki