Merge pull request #37 from fna/master

Fix data load
initial change, update tests
change logic in rate_query to work with data load testing
update test_scenarios, finish data load check
stop tests from failing
Merge pull request #38 from fna/data-load-test-scenarios

Data load test scenarios