Update specs per unit tests
Update specs per API changes
Update spec per API changes around types
Update spec per API changes around types
Update spec per API changes around types