fix failing specs; remove unused helper and spec