Date test and updated model