Get rid of no longer needed tests. #25