Added options and unit tests