Task #0043: Update single rate test + manual layout update.