Fix Spec Tests