Add generators to test