changed date to Date
generated entities updated
Added and updated tests