updating spec to include eql?, cleaning up each spec