Bug fix
More complete option types test case schema