Commit missing tests for r320734