Fix test name conflict.
Prefer && to and.
Prefer parenthesis when using assignment and || over or.
Minor: extra whitespace removed.