Changes in global variables and now testing