cleanup private/protected member/class method definitions
change private to protected
fix private test call