some cleanup for szenario. add test to add demo data