Fix more cases where crf_test location was copied from config
Fix missing $
File names can contain +, especially paths to CRF++