Fix integration test
Merge pull request #86 from leftclickben/FixIntegrationTest

Fix integration test
Consolidate application unit tests.
Merge pull request #87 from leftclickben/ConsolidateApplicationUnitTests

Consolidate application unit tests.