More robust test suite