diff --git a/tools/test/bin/onos-check-views b/tools/test/bin/onos-check-views
index 9b43414..421de90 100755
--- a/tools/test/bin/onos-check-views
+++ b/tools/test/bin/onos-check-views
@@ -7,11 +7,11 @@
 . $ONOS_ROOT/tools/build/envDefaults
 
 aux=/tmp/stc-$$.log
-trap "rm -f $aux $aux.1 $aux.2 2>/dev/null" EXIT
+trap "rm -f $aux 2>/dev/null" EXIT
 
-onos ${1} "onos:ui-views" > $aux
+onos ${1:-$OCI} "onos:ui-views" > $aux
 cat $aux
 
-shift
+[ $# -gt 0 ] && shift
 
-grep "$@" $aux
\ No newline at end of file
+grep "${@:-topo}" $aux
\ No newline at end of file