Fix test failures and mark a couple variables private