Redundant tests deleted.
Tarot functions added.