Merge "Change comments and description for minimum_basic test"