Improved tests, added to report and improved it