removing and correcting several tests