moved test and add more