Change visibility of methods; update tests