Added contains and passes all unit tests