Move option functions spec out of options test