Spec setup updates, almost passing