Make extension methods public and add tests. Change one method name.