Merge "Improve test coverage for ApiBlock.php to 100%"