Don't take ID into account when testing equality
Clean up tests