Added correctly tracing global variable dependencies, and started fixing performance test validation