Updates for more dynamic testing api.