Fixed broken specs and automation tests