Report updated and added a few tests