Add test and change many api