Add straight check and tests