RR: fix tests and syntax formatting touch up