scripts: purge use of test '-a' and '-o' ops and clean up