Remove unnecessary method and add a new expectation test