Fix tests for first release
Remove demo for release