remove static variables optimizations, they create global state that is bad for testing