Tweaked tests, begin adding Test support function