Fixes the test data to include keywords and subjects/tags.
Fixes the test expectations for subject values.
Merge pull request #38 from Connexions/data-fixes

Fixes the testing data to include keywords and subjects (or tags).