Pare down to relevant tests