Improving documentation
Fixing tests to reflect updated method names