Refactored module spec