Added support for expressions in options, added related unit test
Updated option field_weights test to use expressions