Merge "Allow multiple contexts per test case"