Removed the .cfg.xml restriction from the includes.
In commit b90f62 some of the shell scripts were unmodified from the versions that were split apart in commits ac6df0 and b1f171:
In commit be7121 the generic RPM test script was removed.
In commit bc1573 the patch used in the test scripts was removed.

These are correct in this commit.