Including adjusted test cases and moving from strtotime to date_create