Updated model and tests in demo1b