Refactored reportmanger class, changed / added tests