Slightly more robust test suite