more refactoring of tests, added natural key to Feed.yaml, added 'forms-0' to site-submit form test