restructured tests
Merge pull request #60 in CHSBNDL/chaosframework from improve_feeder_test to development

* commit 'e0bd298309fd39553b5f0a7036fe777d76b7b7f5':
  restructured tests