rfp styles
fix tests