Added state and instock options with unit tests.