add test in dev branch
edit in dev4prom
edit in master
fixed conflict