Renamed options
Added tests