small fix + tests
demo changed