More test conversion, minor generation fixes