Add new tests
Fix some problems with next list