Fixed broken specs related to my previous changes