Cleanup and add some integration tests for demo