Refactored to remove dynamic test generation