Removing pointless tests