Merge "Add tests for protected setOption method"