added tests to check all added fields matched expected

fixed bug with tags