WIP: Add demo testing application. Bug fixes.

Issue #3
Issue #4