Merge in query on NSDate changes from Migrant P #30, edit some test methods.