Niche equivalency work

Added to the niche equivalency tests ... still more to go.
Minor edits

Predominantly changed some of the formatting to make the files easier to
follow and did a bit of cleaning.