Added tags to V6 options tests so as they can be run by run_test.py.
Moved options tests to a dedicated folder.