DRY'd up testing support so app can use aux functions too
WIP