Reorganized test files
Switch to using loffah and full version of feedjira