Removing _ from private methods

Updating tests.