Spec common headers refactoring
Refactoring to remove duplicate code