Merged the Carmichael/Fermat tests together.

Added to a class, this will be useful in future when the menu is
created.