remove duplicate test case
file rename
refactory to common operation
Merge branch 'reduce_api_calls'