Refactoring Spec Files