Addressed PR comments: made test helper methods private.