Fix failing specs

That'll teach me to wildly refactor things.