Fix - Spec Tests