refactored test_data

now using dicts to store the data, rather than a class
refactored test_workflow, works with new test_data

the new test_data contains the info in a set, not a class,
this refactoring makes the test_workflow work with the new
set stored data.
debugged new versions of tests
fix test_data merge conflict
Merge pull request #2 from masnes/master

Refactored tests to store data in dictionaries