More unittest added