add uuid entity IDs
fix mocha tests