Merge pull request #3 from JasonBoyles/fix-sample-app-change

Fix sample app change
add tests