Revert "fix test to succeed again"

This reverts commit b886a603ea8aa1ddac5811e14a1504453afeec11.
some commands have spaces in them - ie, syslog reset messages
fixed style differences I introduced