Resolve issue with test cases falling into live mode