Refactored and cleanedup specs