Apply IDE suggestions and ignore sonar false positive Use NullOutputStream.INSTANCE Rework one test slightly