tighten api, select tests