Add option to property. Add and fix tests.