Update logger calls
Correct tests
Use and instead of &&
Merge pull request #69 from odolbeau/update-logger-calls

Update logger calls