Revised tests, revised combinations

Revised combinations and changed the tests to integrate with my fork of Morphological-Metircs