Add test and few fix