Fix failing spec tests