Refactored Existing Tests