new unittest added
Merge branch 'dev-bluebat'