Refactor util test name
Refactor util test name
Refactor base test name
Refactor base test name
Remove unused test suite