Added a few more tests to make report graphs
Fixed silly int math bug