Mixed up the order somewhat.
Try handling normal tests also.