Be able to change level of logging in production
Fix failing test due to memoization and cleanup