Merge "StripState testing and cleanup"