Same here, creating a new test case file, would let you remove the conditions and make each test suite simpler.