proc_test: Rename a few functions, change output a little