Added the rest of the options tests