Cleaning up Date test for D6