restore test
remove obsolete non-auto test
test fixes, cleanups
add option reference