Tests apply to demo too
wip
wip