Spec tests fixed