Fixed Reports, added some unit tests