Merge "Mark relaxed tests as relaxed"