Refactored testing files