make all private things package protected for testing