More pay date tests and logic