Test nested generation, minor fixes