Added unit test for the contains function, fixed another bug (ty Thomas)