Added a TimestampedTrait with tests