Made output more similar to the original output
Type is optional
Added basic tests for the reports