Merge "Remove unnecessary files from target test env"