Add test cases
Fix a bunch of bugs everywhere, improvements for report
More test cases
Fix test cases