Add a little polish to the Id class
Update tests to match some Sf changes