Merge "Tests for API section editing"