refactor method name and minor update on tests