Add some more framework to hang tests off.