remove need for including option sets in test files
automatically recreate option sets