Merge "Update skip_tracker test directory"