Date as string, updated test code