Improve Spec Tests