Fixed failing spec tests