Add custom generator and testing