Add tests, update usage to options object