Hooking the tests back up

Iterative check in.