Update int tests to be one context only