Added some scaffolding for defining deterministic ids through xml and
also added a few fixes (fingers crossed) for broken JUnits.