Adding additional flags for logging
Expanding test coverage