more robust test suite