Refactored the Tests