Update that works better with the specs
Adding new specs and a couple updates the lib/report