Cleaned up tests - the contains() function still gives numerous false positives.