Added data folder and updated model and tests in demo1b