Change the visibility of a lot of variable to make everything testable