foo
For testing, move classes and functions out of qps.C
Get rid of EOL whitespace
Formating functions return strings for testing