Fix generation and tests