Heeded warnings from autoreconf, split up test cases