Issue #2262483 follow-up by sun: Fixed Some PHPUnit tests do not exist.
Issue #1989568 by Berdir: Remove block config ID from being used as an HTML ID or template suggestion.