Removed some debug from test framework
Some updates to basic demo