reorganized tests
Merge branch 'master' of github.com:aneumeier/feeds
more test changes