Fixed mistaken and duplicate tests