Improve testing for single item batch. Only fix self.first if sequence is bigger than one