Tune ADD tests to pass on all configurations