Improve date testing again