worked on functional testing
fixes
fixed unit tests
Merge pull request #2 from financial-media/travis-functional-tests

Travis functional tests