Spec test updates