Changed names and tests for correct methods