Refactored testing to use separate fixtures