More test fixes
Fixed some static variables