start adding test and some other modification post test
add test