Cleaned up some global variables that were being externed in the framework tests