Merge tests from demo branch