Fixed tests to go with changes to the ContentSpec Common Library.