decouple tests from implementation details
Merge branch 'master' of github.com:amz4f/sample_app