Refactored Unit Tests