Refactored Tests and Fixtures