Smell 'opts' defined but never used
Refactor tests