updated method names, and tests