Include check for equality and tests passing except wrapping cases