Clean up Options Model
Add specs for Options module