Fix broken specs due to bad expectations