Merged demos and tests