Style and whitespace
Use more RQ_WRITE from tests