Logging working and tests passing