added manual/auto test options
cleanup
cleanup
cleanup
rename