Put back the refactored generic generation of logs; all tests are green but none of the tests have access to mapper and hence no test is generating logs at this point