Added some failing tests.
Simplified and improved comparisons.