Add Logger and tests