Correcting again interfaces and added tests

[niden]

Hello!

• Type: bug fix
• Link to issue:

In raising this pull request, I confirm the following:

• I have read and understood the Contributing Guidelines
• I have checked that another pull request for this purpose does not exist
• I wrote some tests for this PR
• I have updated the relevant CHANGELOG
• I have created a PR for the documentation about this change

Fixed interfaces for factory, added tests

Thanks

[ruudboon]

@niden Running phpcbf should fix the CI build error.

[codecov]

Codecov Report

Merging #14494 into 4.0.x will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##            4.0.x   #14494      +/-   ##
==========================================
- Coverage    67.7%    67.7%   -0.01%     
==========================================
  Files         482      482              
  Lines      111384   111388       +4     
==========================================
+ Hits        75416    75418       +2     
- Misses      35968    35970       +2