additions to tests
updated feed composition and refactored some tests