fixed tests
added isNull comparison to entity field type
modified handling passed 'choices' option values