Merge "Improve test coverage for ApiDelete.php"