could you wrap all the tests in an ifdef?  I realize this wasn't in place before, but it should have been.