Refactor spec a bit
Timestamp log messages