Added generic wrappers for test functions
Added generic dne test helper
Minor var renaming
Switch val_single to val_multi
Rearanged var order and names