Solve bugs using tests
Fix for lists changes to new id