Add back in a test suite we stripped from the history accidentally