Get new gig int+datetime tests working (ignoring datetime formatting for now)
Much improved handling of tables with multi-field keys