Revert "Make these public for easier testing"

This reverts commit 86e4ff8ce9db44635f0719d19565ffd484d98807.