Improve coverage + use eq_ shortcut