Really need to switch to use a more reliable test suite