Fix broken specs, all green now