Modify recent tests to support more configurations