If possible see if you can convert the logging setup and test helpers to annotations The annotation/helper for test will be separated into another ticket.