using feed objects in tests. cleaned the tests up a little