Fix same expiration_dt bug, tests included