refactoring test cases to move any dependent tests out as tags for the new test framework support