Updated data agents and handlers and added tests
Merge pull request #463 from tgiguere/new_data_agent

Updated data agents and handlers and added tests