Fixed broken unit tests around options, options should not support nested collections

In branch: master