-- add contains test.
-- minor refactor.