Refactored Tests Further