Move options tests out to their own file, add some more meat to it