Added unit tests for different aspects of new options usage.