Change some testing variables back to private