Add in More Clone and Equals Tests