Clean up existing tests to use our new internal classes
RootDir != RootAppDir