Refactored logger and generator specs