Reworked and spec should pass