Updates to sdk spec and to catalog spec.
added a couple tweaks on catalog test.