Integrate feedback from review

Modifies test and slight refactoring on code called for logging.
Test *might* still fail. Gonna let travis do the checking for me.