Fixed codegen + cleaned test data